Auto merge of #1317 - alexcrichton:issue-1297, r=huonw
authorbors <bors@rust-lang.org>
Tue, 17 Feb 2015 05:00:30 +0000 (05:00 +0000)
committerbors <bors@rust-lang.org>
Tue, 17 Feb 2015 05:00:30 +0000 (05:00 +0000)
Not sure why we were doing this, it's quite useful!

Closes #1297


Trivial merge